]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
extensionPrefs: Use a single line for description
authorFlorian Müllner <fmuellner@gnome.org>
Sat, 30 Nov 2019 02:33:27 +0000 (03:33 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Mon, 3 Feb 2020 18:11:21 +0000 (19:11 +0100)
The current fixed two-line label requires a custom widget, which
make moving to a widget template harder.

As the description will soon move elsewhere anyway, just go back
to a single line with a standard label for now.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1968

js/extensionPrefs/main.js

index 0803761a1e7f8796ca2df2afbf06c44cb468343c..4a8ace085123828674a0004aa99cd98f6ebef06e 100644 (file)
@@ -471,16 +471,6 @@ var Expander = GObject.registerClass({
     }
 });
 
-var DescriptionLabel = GObject.registerClass(
-class DescriptionLabel extends Gtk.Label {
-    vfunc_get_preferred_height_for_width(width) {
-        // Hack: Request the maximum height allowed by the line limit
-        if (this.lines > 0)
-            return super.vfunc_get_preferred_height_for_width(0);
-        return super.vfunc_get_preferred_height_for_width(width);
-    }
-});
-
 var ExtensionRow = GObject.registerClass(
 class ExtensionRow extends Gtk.ListBoxRow {
     _init(extension) {
@@ -552,10 +542,13 @@ class ExtensionRow extends Gtk.ListBoxRow {
         vbox.add(label);
 
         let desc = this._extension.metadata.description.split('\n')[0];
-        label = new DescriptionLabel({ label: desc, wrap: true, lines: 2,
-                                       ellipsize: Pango.EllipsizeMode.END,
-                                       max_width_chars: 60,
-                                       xalign: 0, yalign: 0 });
+        label = new Gtk.Label({
+            label: desc,
+            ellipsize: Pango.EllipsizeMode.END,
+            max_width_chars: 60,
+            xalign: 0,
+            yalign: 0,
+        });
         vbox.add(label);
 
         let button = new Gtk.Button({ valign: Gtk.Align.CENTER,